auto merge of #611 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 21 Sep 2014 20:31:12 +0000 (20:31 +0000)
committerbors <bors@rust-lang.org>
Sun, 21 Sep 2014 20:31:12 +0000 (20:31 +0000)

Trivial merge